diff --git a/Makefile b/Makefile
index c04917f..b8713a4 100644
--- a/Makefile
+++ b/Makefile
@@ -243,8 +243,7 @@
 LIBS-$(CONFIG_IXP4XX_NPE) += drivers/net/npe/
 LIBS-$(CONFIG_OF_EMBED) += dts/
 LIBS-y += arch/$(ARCH)/lib/
-LIBS-y += fs/ \
-	fs/fat/
+LIBS-y += fs/
 LIBS-y += net/
 LIBS-y += disk/
 LIBS-y += drivers/
diff --git a/fs/Makefile b/fs/Makefile
index bdcd746..ee01a7d 100644
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -6,11 +6,15 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
+ifdef CONFIG_SPL_BUILD
+obj-$(CONFIG_SPL_FAT_SUPPORT) += fat/
+else
 obj-y				+= fs.o
 
 obj-y += cbfs/
 obj-y += cramfs/
 obj-y += ext4/
+obj-y += fat/
 obj-y += fdos/
 obj-y += jffs2/
 obj-y += reiserfs/
@@ -18,3 +22,4 @@
 obj-y += ubifs/
 obj-y += yaffs2/
 obj-y += zfs/
+endif
diff --git a/spl/Makefile b/spl/Makefile
index 5bc75b4..29d7818 100644
--- a/spl/Makefile
+++ b/spl/Makefile
@@ -73,7 +73,7 @@
 LIBS-$(CONFIG_SPL_SERIAL_SUPPORT) += drivers/serial/
 LIBS-$(CONFIG_SPL_SPI_FLASH_SUPPORT) += drivers/mtd/spi/
 LIBS-$(CONFIG_SPL_SPI_SUPPORT) += drivers/spi/
-LIBS-$(CONFIG_SPL_FAT_SUPPORT) += fs/fat/
+LIBS-y += fs/
 LIBS-$(CONFIG_SPL_LIBGENERIC_SUPPORT) += lib/
 LIBS-$(CONFIG_SPL_POWER_SUPPORT) += drivers/power/ \
 	drivers/power/pmic/